each source generation rule needs to use its own temporary file, to avoid

Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>

        * gtk/Makefile.am: each source generation rule needs to use its own
        temporary file, to avoid clashes for parallel builds. fixed rules
        for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.

diff --git a/ChangeLog b/ChangeLog
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f6c5e0248bb98643d10a6a75512e47bab7a55b8..4258c34b99c41eb9ff1474b4275d022a91877e0d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec  7 12:07:15 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/Makefile.am: each source generation rule needs to use its own
+       temporary file, to avoid clashes for parallel builds. fixed rules
+       for gtkmarshalers.h and gtkmarshalers.c to use their own temp files.
+
 2001-12-07  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index af5a44938a1df68266506fe64be1b16e87a48799..670ee1c5aee6ae1643c0565b90f96775e0dc28ff 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -456,7 +456,7 @@ EXTRA_DIST += $(gtk_built_sources)
 # rules to generate built sources
 #
 # setup autogeneration dependancies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
+gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
 CLEANFILES = $(gen_sources)
 Makefile: oldest-source-stamp  # oh boy, does automake SUCK!
 oldest-source-stamp: $(gtk_built_sources)
@@ -493,9 +493,9 @@ $(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h
           *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
        esac;                                                                                   \
        cd $(srcdir)                                                                            \
-       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmh      \
-       && (cmp -s xgen-gmh gtkmarshalers.h || cp xgen-gmh gtkmarshalers.h)                     \
-       && rm -f xgen-gmh xgen-gmh~                                                             \
+       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmlh     \
+       && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h)                   \
+       && rm -f xgen-gmlh                                                                      \
        && echo timestamp > $(@F)
 $(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
        case @GLIB_GENMARSHAL@ in                                                               \
@@ -503,9 +503,9 @@ $(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
           *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
        esac;                                                                                   \
        cd $(srcdir)                                                                            \
-       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmc        \
-       && cp xgen-gmc gtkmarshalers.c                                                          \
-       && rm -f xgen-gmc xgen-gmc~
+       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmlc       \
+       && cp xgen-gmlc gtkmarshalers.c                                                         \
+       && rm -f xgen-gmlc 
 $(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
        case @GLIB_GENMARSHAL@ in                                                               \
           .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
@@ -516,7 +516,7 @@ $(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
         && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh         \
        && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh                               \
        && cp xgen-gmh gtkmarshal.h                                                             \
-       && rm -f xgen-gmh xgen-gmh~
+       && rm -f xgen-gmh 
 $(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
        case @GLIB_GENMARSHAL@ in                                                               \
           .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
@@ -525,7 +525,7 @@ $(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
        cd $(srcdir)                                                                            \
        && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc            \
        && cp xgen-gmc gtkmarshal.c                                                             \
-       && rm -f xgen-gmc xgen-gmc~
+       && rm -f xgen-gmc 
 
 $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
        cd $(srcdir) \